button: Don't include margins in input window size

And do the same thing for GtkCheckButton

https://bugzilla.gnome.org/show_bug.cgi?id=760509

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 697d7e26b51a9630d8e5b9ede2e1032437ce77a2..56452bb8437beb8600a30fe05c72f787d7bc510a 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1760,14 +1760,6 @@ gtk_button_size_allocate (GtkWidget     *widget,
   GtkAllocation clip;
 
   gtk_widget_set_allocation (widget, allocation);
-
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (priv->event_window,
-                            allocation->x,
-                            allocation->y,
-                            allocation->width,
-                            allocation->height);
-
   gtk_css_gadget_allocate (priv->gadget,
                            allocation,
                            gtk_widget_get_allocated_baseline (widget),
@@ -1792,6 +1784,17 @@ gtk_button_allocate (GtkCssGadget        *gadget,
   if (child && gtk_widget_get_visible (child))
     gtk_widget_size_allocate_with_baseline (child, (GtkAllocation *)allocation, baseline);
 
+  if (gtk_widget_get_realized (widget))
+    {
+      GtkAllocation border_allocation;
+      gtk_css_gadget_get_border_allocation (gadget, &border_allocation, NULL);
+      gdk_window_move_resize (GTK_BUTTON (widget)->priv->event_window,
+                              border_allocation.x,
+                              border_allocation.y,
+                              border_allocation.width,
+                              border_allocation.height);
+    }
+
   gtk_container_get_children_clip (GTK_CONTAINER (widget), out_clip);
 }
 

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 4db33a67e132ad17cdee6761f0ade2411eb45aad..42b0d7073343df5833fbb8fdd66f868018a00e31 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -643,14 +643,6 @@ gtk_check_button_size_allocate (GtkWidget     *widget,
     gadget = GTK_BUTTON (widget)->priv->gadget;
 
   gtk_widget_set_allocation (widget, allocation);
-
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (GTK_BUTTON (widget)->priv->event_window,
-                            allocation->x,
-                            allocation->y,
-                            allocation->width,
-                            allocation->height);
-
   gtk_css_gadget_allocate (gadget,
                            allocation,
                            gtk_widget_get_allocated_baseline (widget),
@@ -732,6 +724,17 @@ gtk_check_button_allocate (GtkCssGadget        *gadget,
       (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics));
   pango_font_metrics_unref (metrics);
 
+  if (gtk_widget_get_realized (widget))
+    {
+      GtkAllocation border_allocation;
+      gtk_css_gadget_get_border_allocation (gadget, &border_allocation, NULL);
+      gdk_window_move_resize (GTK_BUTTON (widget)->priv->event_window,
+                              border_allocation.x,
+                              border_allocation.y,
+                              border_allocation.width,
+                              border_allocation.height);
+    }
+
   gtk_container_get_children_clip (GTK_CONTAINER (widget), out_clip);
   gdk_rectangle_union (out_clip, &check_clip, out_clip);
 }